inspector: Make listbox rows non-activatable

diff --git a/gtk/inspector/general.ui b/gtk/inspector/general.ui
index 65de4f641a550f5a3396aef065aa5b757c16f304..390d10b3b0c5a2e28cc3c9129d62d91a825a90ee 100644 (file)
--- a/gtk/inspector/general.ui
+++ b/gtk/inspector/general.ui
@@ -13,57 +13,69 @@
             <property name="visible">True</property>
             <property name="selection-mode">none</property>
             <child>
-              <object class="GtkBox">
+              <object class="GtkListBoxRow">
                 <property name="visible">True</property>
-                <property name="orientation">horizontal</property>
-                <property name="margin">10</property>
-                <property name="spacing">40</property>
+                <property name="activatable">False</property>
                 <child>
-                  <object class="GtkLabel" id="gtk_version_label">
+                  <object class="GtkBox">
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">GTK+ Version</property>
-                    <property name="halign">start</property>
-                    <property name="valign">baseline</property>
-                    <property name="xalign">0.0</property>
+                    <property name="orientation">horizontal</property>
+                    <property name="margin">10</property>
+                    <property name="spacing">40</property>
+                    <child>
+                      <object class="GtkLabel" id="gtk_version_label">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">GTK+ Version</property>
+                        <property name="halign">start</property>
+                        <property name="valign">baseline</property>
+                        <property name="xalign">0.0</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="gtk_version">
+                        <property name="visible">True</property>
+                        <property name="halign">end</property>
+                        <property name="valign">baseline</property>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                      </packing>
+                    </child>
                   </object>
                 </child>
-                <child>
-                  <object class="GtkLabel" id="gtk_version">
-                    <property name="visible">True</property>
-                    <property name="halign">end</property>
-                    <property name="valign">baseline</property>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                  </packing>
-                </child>
               </object>
             </child>
             <child>
-              <object class="GtkBox">
+              <object class="GtkListBoxRow">
                 <property name="visible">True</property>
-                <property name="orientation">horizontal</property>
-                <property name="margin">10</property>
-                <property name="spacing">40</property>
+                <property name="activatable">False</property>
                 <child>
-                  <object class="GtkLabel" id="gdk_backend_label">
+                  <object class="GtkBox">
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">GDK Backend</property>
-                    <property name="halign">start</property>
-                    <property name="valign">baseline</property>
-                    <property name="xalign">0.0</property>
+                    <property name="orientation">horizontal</property>
+                    <property name="margin">10</property>
+                    <property name="spacing">40</property>
+                    <child>
+                      <object class="GtkLabel" id="gdk_backend_label">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">GDK Backend</property>
+                        <property name="halign">start</property>
+                        <property name="valign">baseline</property>
+                        <property name="xalign">0.0</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="gdk_backend">
+                        <property name="visible">True</property>
+                        <property name="halign">end</property>
+                        <property name="valign">baseline</property>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                      </packing>
+                    </child>
                   </object>
                 </child>
-                <child>
-                  <object class="GtkLabel" id="gdk_backend">
-                    <property name="visible">True</property>
-                    <property name="halign">end</property>
-                    <property name="valign">baseline</property>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                  </packing>
-                </child>
               </object>
             </child>
           </object>
@@ -79,58 +91,70 @@
             <property name="visible">True</property>
             <property name="selection-mode">none</property>
             <child>
-              <object class="GtkBox">
+              <object class="GtkListBoxRow">
                 <property name="visible">True</property>
-                <property name="orientation">horizontal</property>
-                <property name="margin">10</property>
-                <property name="spacing">40</property>
+                <property name="activatable">False</property>
                 <child>
-                  <object class="GtkLabel" id="prefix_label">
+                  <object class="GtkBox">
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">Prefix</property>
-                    <property name="halign">start</property>
-                    <property name="valign">baseline</property>
-                    <property name="xalign">0.0</property>
+                    <property name="orientation">horizontal</property>
+                    <property name="margin">10</property>
+                    <property name="spacing">40</property>
+                    <child>
+                      <object class="GtkLabel" id="prefix_label">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">Prefix</property>
+                        <property name="halign">start</property>
+                        <property name="valign">baseline</property>
+                        <property name="xalign">0.0</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="prefix">
+                        <property name="visible">True</property>
+                        <property name="halign">end</property>
+                        <property name="valign">baseline</property>
+                        <property name="ellipsize">end</property>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                      </packing>
+                    </child>
                   </object>
                 </child>
-                <child>
-                  <object class="GtkLabel" id="prefix">
-                    <property name="visible">True</property>
-                    <property name="halign">end</property>
-                    <property name="valign">baseline</property>
-                    <property name="ellipsize">end</property>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                  </packing>
-                </child>
               </object>
             </child>
             <child>
-              <object class="GtkBox">
+              <object class="GtkListBoxRow">
                 <property name="visible">True</property>
-                <property name="orientation">horizontal</property>
-                <property name="margin">10</property>
-                <property name="spacing">40</property>
-                <child>
-                  <object class="GtkLabel" id="xdg_data_home_label">
-                    <property name="visible">True</property>
-                    <property name="label">XDG_DATA_HOME</property>
-                    <property name="halign">start</property>
-                    <property name="valign">baseline</property>
-                    <property name="xalign">0.0</property>
-                  </object>
-                </child>
+                <property name="activatable">False</property>
                 <child>
-                  <object class="GtkLabel" id="xdg_data_home">
+                  <object class="GtkBox">
                     <property name="visible">True</property>
-                    <property name="halign">end</property>
-                    <property name="valign">baseline</property>
-                    <property name="ellipsize">end</property>
+                    <property name="orientation">horizontal</property>
+                    <property name="margin">10</property>
+                    <property name="spacing">40</property>
+                    <child>
+                      <object class="GtkLabel" id="xdg_data_home_label">
+                        <property name="visible">True</property>
+                        <property name="label">XDG_DATA_HOME</property>
+                        <property name="halign">start</property>
+                        <property name="valign">baseline</property>
+                        <property name="xalign">0.0</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="xdg_data_home">
+                        <property name="visible">True</property>
+                        <property name="halign">end</property>
+                        <property name="valign">baseline</property>
+                        <property name="ellipsize">end</property>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                      </packing>
+                    </child>
                   </object>
-                  <packing>
-                    <property name="expand">True</property>
-                  </packing>
                 </child>
               </object>
             </child>
@@ -163,114 +187,138 @@
               </object>
             </child>
             <child>
-              <object class="GtkBox">
+              <object class="GtkListBoxRow">
                 <property name="visible">True</property>
-                <property name="orientation">horizontal</property>
-                <property name="margin">10</property>
-                <property name="spacing">40</property>
+                <property name="activatable">False</property>
                 <child>
-                  <object class="GtkLabel" id="gtk_path_label">
+                  <object class="GtkBox">
                     <property name="visible">True</property>
-                    <property name="label">GTK_PATH</property>
-                    <property name="halign">start</property>
-                    <property name="valign">baseline</property>
-                    <property name="xalign">0.0</property>
+                    <property name="orientation">horizontal</property>
+                    <property name="margin">10</property>
+                    <property name="spacing">40</property>
+                    <child>
+                      <object class="GtkLabel" id="gtk_path_label">
+                        <property name="visible">True</property>
+                        <property name="label">GTK_PATH</property>
+                        <property name="halign">start</property>
+                        <property name="valign">baseline</property>
+                        <property name="xalign">0.0</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="gtk_path">
+                        <property name="visible">True</property>
+                        <property name="halign">end</property>
+                        <property name="valign">baseline</property>
+                        <property name="ellipsize">end</property>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                      </packing>
+                    </child>
                   </object>
                 </child>
-                <child>
-                  <object class="GtkLabel" id="gtk_path">
-                    <property name="visible">True</property>
-                    <property name="halign">end</property>
-                    <property name="valign">baseline</property>
-                    <property name="ellipsize">end</property>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                  </packing>
-                </child>
               </object>
             </child>
             <child>
-              <object class="GtkBox">
+              <object class="GtkListBoxRow">
                 <property name="visible">True</property>
-                <property name="orientation">horizontal</property>
-                <property name="margin">10</property>
-                <property name="spacing">40</property>
+                <property name="activatable">False</property>
                 <child>
-                  <object class="GtkLabel" id="gtk_exe_prefix_label">
+                  <object class="GtkBox">
                     <property name="visible">True</property>
-                    <property name="label">GTK_EXE_PREFIX</property>
-                    <property name="halign">start</property>
-                    <property name="valign">baseline</property>
-                    <property name="xalign">0.0</property>
+                    <property name="orientation">horizontal</property>
+                    <property name="margin">10</property>
+                    <property name="spacing">40</property>
+                    <child>
+                      <object class="GtkLabel" id="gtk_exe_prefix_label">
+                        <property name="visible">True</property>
+                        <property name="label">GTK_EXE_PREFIX</property>
+                        <property name="halign">start</property>
+                        <property name="valign">baseline</property>
+                        <property name="xalign">0.0</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="gtk_exe_prefix">
+                        <property name="visible">True</property>
+                        <property name="halign">end</property>
+                        <property name="valign">baseline</property>
+                        <property name="ellipsize">end</property>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                      </packing>
+                    </child>
                   </object>
                 </child>
-                <child>
-                  <object class="GtkLabel" id="gtk_exe_prefix">
-                    <property name="visible">True</property>
-                    <property name="halign">end</property>
-                    <property name="valign">baseline</property>
-                    <property name="ellipsize">end</property>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                  </packing>
-                </child>
               </object>
             </child>
             <child>
-              <object class="GtkBox">
+              <object class="GtkListBoxRow">
                 <property name="visible">True</property>
-                <property name="orientation">horizontal</property>
-                <property name="margin">10</property>
-                <property name="spacing">40</property>
+                <property name="activatable">False</property>
                 <child>
-                  <object class="GtkLabel" id="gtk_data_prefix_label">
+                  <object class="GtkBox">
                     <property name="visible">True</property>
-                    <property name="label">GTK_DATA_PREFIX</property>
-                    <property name="halign">start</property>
-                    <property name="valign">baseline</property>
-                    <property name="xalign">0.0</property>
+                    <property name="orientation">horizontal</property>
+                    <property name="margin">10</property>
+                    <property name="spacing">40</property>
+                    <child>
+                      <object class="GtkLabel" id="gtk_data_prefix_label">
+                        <property name="visible">True</property>
+                        <property name="label">GTK_DATA_PREFIX</property>
+                        <property name="halign">start</property>
+                        <property name="valign">baseline</property>
+                        <property name="xalign">0.0</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="gtk_data_prefix">
+                        <property name="visible">True</property>
+                        <property name="halign">end</property>
+                        <property name="valign">baseline</property>
+                        <property name="ellipsize">end</property>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                      </packing>
+                    </child>
                   </object>
                 </child>
-                <child>
-                  <object class="GtkLabel" id="gtk_data_prefix">
-                    <property name="visible">True</property>
-                    <property name="halign">end</property>
-                    <property name="valign">baseline</property>
-                    <property name="ellipsize">end</property>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                  </packing>
-                </child>
               </object>
             </child>
             <child>
-              <object class="GtkBox">
+              <object class="GtkListBoxRow">
                 <property name="visible">True</property>
-                <property name="orientation">horizontal</property>
-                <property name="margin">10</property>
-                <property name="spacing">40</property>
-                <child>
-                  <object class="GtkLabel" id="gsettings_schema_dir_label">
-                    <property name="visible">True</property>
-                    <property name="label">GSETTINGS_SCHEMA_DIR</property>
-                    <property name="halign">start</property>
-                    <property name="valign">baseline</property>
-                    <property name="xalign">0.0</property>
-                  </object>
-                </child>
+                <property name="activatable">False</property>
                 <child>
-                  <object class="GtkLabel" id="gsettings_schema_dir">
+                  <object class="GtkBox">
                     <property name="visible">True</property>
-                    <property name="halign">end</property>
-                    <property name="valign">baseline</property>
-                    <property name="ellipsize">end</property>
+                    <property name="orientation">horizontal</property>
+                    <property name="margin">10</property>
+                    <property name="spacing">40</property>
+                    <child>
+                      <object class="GtkLabel" id="gsettings_schema_dir_label">
+                        <property name="visible">True</property>
+                        <property name="label">GSETTINGS_SCHEMA_DIR</property>
+                        <property name="halign">start</property>
+                        <property name="valign">baseline</property>
+                        <property name="xalign">0.0</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="gsettings_schema_dir">
+                        <property name="visible">True</property>
+                        <property name="halign">end</property>
+                        <property name="valign">baseline</property>
+                        <property name="ellipsize">end</property>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                      </packing>
+                    </child>
                   </object>
-                  <packing>
-                    <property name="expand">True</property>
-                  </packing>
                 </child>
               </object>
             </child>

diff --git a/gtk/inspector/visual.ui b/gtk/inspector/visual.ui
index 499bc4ad1072dcc601487fbb87ce786fa7e8981a..33052231d7e6ffb19b104b9ff8da104315842066 100644 (file)
--- a/gtk/inspector/visual.ui
+++ b/gtk/inspector/visual.ui
@@ -11,285 +11,341 @@
     <property name="vscrollbar-policy">automatic</property>
     <child>
       <object class="GtkBox">
-    <property name="visible">True</property>
-    <property name="orientation">vertical</property>
-    <property name="margin">60</property>
-    <property name="spacing">10</property>
-    <child>
-      <object class="GtkFrame" id="visual_frame">
         <property name="visible">True</property>
-        <property name="halign">center</property>
+        <property name="orientation">vertical</property>
+        <property name="margin">60</property>
+        <property name="spacing">10</property>
         <child>
-          <object class="GtkListBox" id="visual_box">
+          <object class="GtkFrame" id="visual_frame">
             <property name="visible">True</property>
-            <property name="selection-mode">none</property>
-            <style>
-              <class name="view"/>
-            </style>
-            <child>
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="orientation">horizontal</property>
-                <property name="margin">10</property>
-                <property name="spacing">40</property>
-                <child>
-                  <object class="GtkLabel" id="theme_label">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">GTK+ Theme</property>
-                    <property name="halign">start</property>
-                    <property name="valign">baseline</property>
-                    <property name="xalign">0.0</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkComboBoxText" id="theme_combo">
-                    <property name="visible">True</property>
-                    <property name="halign">end</property>
-                    <property name="valign">baseline</property>
-                    <signal name="changed" handler="theme_changed"/>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                  </packing>
-                </child>
-              </object>
-            </child>
+            <property name="halign">center</property>
             <child>
-              <object class="GtkBox">
+              <object class="GtkListBox" id="visual_box">
                 <property name="visible">True</property>
-                <property name="orientation">horizontal</property>
-                <property name="margin">10</property>
-                <property name="spacing">40</property>
+                <property name="selection-mode">none</property>
+                <style>
+                  <class name="view"/>
+                </style>
                 <child>
-                  <object class="GtkLabel" id="dark_label">
+                  <object class="GtkListBoxRow">
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">Dark variant</property>
-                    <property name="halign">start</property>
-                    <property name="valign">baseline</property>
-                    <property name="xalign">0.0</property>
+                    <property name="activatable">False</property>
+                    <child>
+                      <object class="GtkBox">
+                        <property name="visible">True</property>
+                        <property name="orientation">horizontal</property>
+                        <property name="margin">10</property>
+                        <property name="spacing">40</property>
+                        <child>
+                          <object class="GtkLabel" id="theme_label">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">GTK+ Theme</property>
+                            <property name="halign">start</property>
+                            <property name="valign">baseline</property>
+                            <property name="xalign">0.0</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkComboBoxText" id="theme_combo">
+                            <property name="visible">True</property>
+                            <property name="halign">end</property>
+                            <property name="valign">baseline</property>
+                            <signal name="changed" handler="theme_changed"/>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                          </packing>
+                        </child>
+                      </object>
+                    </child>
                   </object>
                 </child>
                 <child>
-                  <object class="GtkSwitch" id="dark_switch">
-                    <property name="visible">True</property>
-                    <property name="halign">end</property>
-                    <property name="valign">baseline</property>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                  </packing>
-                </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="orientation">horizontal</property>
-                <property name="margin">10</property>
-                <property name="spacing">40</property>
-                <child>
-                  <object class="GtkLabel" id="icon_label">
+                  <object class="GtkListBoxRow">
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">Icon Theme</property>
-                    <property name="halign">start</property>
-                    <property name="valign">baseline</property>
-                    <property name="xalign">0.0</property>
+                    <property name="activatable">False</property>
+                    <child>
+                      <object class="GtkBox">
+                        <property name="visible">True</property>
+                        <property name="orientation">horizontal</property>
+                        <property name="margin">10</property>
+                        <property name="spacing">40</property>
+                        <child>
+                          <object class="GtkLabel" id="dark_label">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">Dark variant</property>
+                            <property name="halign">start</property>
+                            <property name="valign">baseline</property>
+                            <property name="xalign">0.0</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkSwitch" id="dark_switch">
+                            <property name="visible">True</property>
+                            <property name="halign">end</property>
+                            <property name="valign">baseline</property>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                          </packing>
+                        </child>
+                      </object>
+                    </child>
                   </object>
                 </child>
                 <child>
-                  <object class="GtkComboBoxText" id="icon_combo">
+                  <object class="GtkListBoxRow">
                     <property name="visible">True</property>
-                    <property name="halign">end</property>
-                    <property name="valign">baseline</property>
-                    <signal name="changed" handler="icons_changed"/>
+                    <property name="activatable">False</property>
+                    <child>
+                      <object class="GtkBox">
+                        <property name="visible">True</property>
+                        <property name="orientation">horizontal</property>
+                        <property name="margin">10</property>
+                        <property name="spacing">40</property>
+                        <child>
+                          <object class="GtkLabel" id="icon_label">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">Icon Theme</property>
+                            <property name="halign">start</property>
+                            <property name="valign">baseline</property>
+                            <property name="xalign">0.0</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkComboBoxText" id="icon_combo">
+                            <property name="visible">True</property>
+                            <property name="halign">end</property>
+                            <property name="valign">baseline</property>
+                            <signal name="changed" handler="icons_changed"/>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                          </packing>
+                        </child>
+                      </object>
+                    </child>
                   </object>
-                  <packing>
-                    <property name="expand">True</property>
-                  </packing>
                 </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="orientation">horizontal</property>
-                <property name="margin">10</property>
-                <property name="spacing">40</property>
                 <child>
-                  <object class="GtkLabel" id="direction_label">
+                  <object class="GtkListBoxRow">
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">Text Direction</property>
-                    <property name="halign">start</property>
-                    <property name="valign">baseline</property>
-                    <property name="xalign">0.0</property>
+                    <property name="activatable">False</property>
+                    <child>
+                      <object class="GtkBox">
+                        <property name="visible">True</property>
+                        <property name="orientation">horizontal</property>
+                        <property name="margin">10</property>
+                        <property name="spacing">40</property>
+                        <child>
+                          <object class="GtkLabel" id="direction_label">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">Text Direction</property>
+                            <property name="halign">start</property>
+                            <property name="valign">baseline</property>
+                            <property name="xalign">0.0</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkComboBoxText" id="direction_combo">
+                            <property name="visible">True</property>
+                            <property name="halign">end</property>
+                            <property name="valign">baseline</property>
+                            <signal name="changed" handler="direction_changed"/>
+                            <items>
+                              <item translatable="yes" id="ltr">Left-to-Right</item>
+                              <item translatable="yes" id="rtl">Right-to-Left</item>
+                            </items>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                          </packing>
+                        </child>
+                      </object>
+                    </child>
                   </object>
                 </child>
                 <child>
-                  <object class="GtkComboBoxText" id="direction_combo">
+                  <object class="GtkListBoxRow">
                     <property name="visible">True</property>
-                    <property name="halign">end</property>
-                    <property name="valign">baseline</property>
-                    <signal name="changed" handler="direction_changed"/>
-                    <items>
-                      <item translatable="yes" id="ltr">Left-to-Right</item>
-                      <item translatable="yes" id="rtl">Right-to-Left</item>
-                    </items>
+                    <property name="activatable">False</property>
+                    <child>
+                      <object class="GtkBox">
+                        <property name="visible">True</property>
+                        <property name="orientation">horizontal</property>
+                        <property name="margin">10</property>
+                        <property name="spacing">40</property>
+                        <child>
+                          <object class="GtkLabel" id="hidpi_label">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">Window scaling</property>
+                            <property name="halign">start</property>
+                            <property name="valign">baseline</property>
+                            <property name="xalign">0.0</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkSpinButton" id="hidpi_spin">
+                            <property name="visible">True</property>
+                            <property name="halign">end</property>
+                            <property name="valign">baseline</property>
+                            <property name="adjustment">scale_adjustment</property>
+                            <property name="snap-to-ticks">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                          </packing>
+                        </child>
+                      </object>
+                    </child>
                   </object>
-                  <packing>
-                    <property name="expand">True</property>
-                  </packing>
-                </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="orientation">horizontal</property>
-                <property name="margin">10</property>
-                <property name="spacing">40</property>
-                <child>
-                  <object class="GtkLabel" id="hidpi_label">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">Window scaling</property>
-                    <property name="halign">start</property>
-                    <property name="valign">baseline</property>
-                    <property name="xalign">0.0</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkSpinButton" id="hidpi_spin">
-                    <property name="visible">True</property>
-                    <property name="halign">end</property>
-                    <property name="valign">baseline</property>
-                    <property name="adjustment">scale_adjustment</property>
-                    <property name="snap-to-ticks">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                  </packing>
                 </child>
               </object>
             </child>
           </object>
         </child>
-      </object>
-    </child>
-    <child>
-      <object class="GtkFrame" id="debug_frame">
-        <property name="visible">True</property>
-        <property name="halign">center</property>
         <child>
-          <object class="GtkListBox" id="debug_box">
+          <object class="GtkFrame" id="debug_frame">
             <property name="visible">True</property>
-            <property name="selection-mode">none</property>
+            <property name="halign">center</property>
             <child>
-              <object class="GtkBox">
+              <object class="GtkListBox" id="debug_box">
                 <property name="visible">True</property>
-                <property name="orientation">horizontal</property>
-                <property name="margin">10</property>
-                <property name="spacing">40</property>
+                <property name="selection-mode">none</property>
                 <child>
-                  <object class="GtkLabel" id="updates_label">
+                  <object class="GtkListBoxRow">
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">Show Graphic Updates</property>
-                    <property name="halign">start</property>
-                    <property name="valign">baseline</property>
-                    <property name="xalign">0.0</property>
+                    <property name="activatable">False</property>
+                    <child>
+                      <object class="GtkBox">
+                        <property name="visible">True</property>
+                        <property name="orientation">horizontal</property>
+                        <property name="margin">10</property>
+                        <property name="spacing">40</property>
+                        <child>
+                          <object class="GtkLabel" id="updates_label">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">Show Graphic Updates</property>
+                            <property name="halign">start</property>
+                            <property name="valign">baseline</property>
+                            <property name="xalign">0.0</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkSwitch" id="updates_switch">
+                            <property name="visible">True</property>
+                            <property name="halign">end</property>
+                            <property name="valign">baseline</property>
+                            <signal name="notify::active" handler="updates_activate"/>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                          </packing>
+                        </child>
+                      </object>
+                    </child>
                   </object>
                 </child>
                 <child>
-                  <object class="GtkSwitch" id="updates_switch">
+                  <object class="GtkListBoxRow">
                     <property name="visible">True</property>
-                    <property name="halign">end</property>
-                    <property name="valign">baseline</property>
-                    <signal name="notify::active" handler="updates_activate"/>
+                    <property name="activatable">False</property>
+                    <child>
+                      <object class="GtkBox">
+                        <property name="visible">True</property>
+                        <property name="orientation">horizontal</property>
+                        <property name="margin">10</property>
+                        <property name="spacing">40</property>
+                        <child>
+                          <object class="GtkLabel" id="baselines_label">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">Show Baselines</property>
+                            <property name="halign">start</property>
+                            <property name="valign">baseline</property>
+                            <property name="xalign">0.0</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkSwitch" id="baselines_switch">
+                            <property name="visible">True</property>
+                            <property name="halign">end</property>
+                            <property name="valign">baseline</property>
+                            <signal name="notify::active" handler="baselines_activate"/>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                          </packing>
+                        </child>
+                      </object>
+                    </child>
                   </object>
-                  <packing>
-                    <property name="expand">True</property>
-                  </packing>
                 </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="orientation">horizontal</property>
-                <property name="margin">10</property>
-                <property name="spacing">40</property>
                 <child>
-                  <object class="GtkLabel" id="baselines_label">
+                  <object class="GtkListBoxRow">
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">Show Baselines</property>
-                    <property name="halign">start</property>
-                    <property name="valign">baseline</property>
-                    <property name="xalign">0.0</property>
+                    <property name="activatable">False</property>
+                    <child>
+                      <object class="GtkBox">
+                        <property name="visible">True</property>
+                        <property name="orientation">horizontal</property>
+                        <property name="margin">10</property>
+                        <property name="spacing">40</property>
+                        <child>
+                          <object class="GtkLabel" id="pixelcache_label">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">Show Pixel Cache</property>
+                            <property name="halign">start</property>
+                            <property name="valign">baseline</property>
+                            <property name="xalign">0.0</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkSwitch" id="pixelcache_switch">
+                            <property name="visible">True</property>
+                            <property name="halign">end</property>
+                            <property name="valign">baseline</property>
+                            <signal name="notify::active" handler="pixelcache_activate"/>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                          </packing>
+                        </child>
+                      </object>
+                    </child>
                   </object>
                 </child>
                 <child>
-                  <object class="GtkSwitch" id="baselines_switch">
+                  <object class="GtkListBoxRow">
                     <property name="visible">True</property>
-                    <property name="halign">end</property>
-                    <property name="valign">baseline</property>
-                    <signal name="notify::active" handler="baselines_activate"/>
+                    <property name="activatable">False</property>
+                    <child>
+                      <object class="GtkBox">
+                        <property name="visible">True</property>
+                        <property name="orientation">horizontal</property>
+                        <property name="margin">10</property>
+                        <property name="spacing">40</property>
+                        <child>
+                          <object class="GtkLabel" id="touchscreen_label">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">Simulate touchscreen</property>
+                            <property name="halign">start</property>
+                            <property name="valign">baseline</property>
+                            <property name="xalign">0.0</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkSwitch" id="touchscreen_switch">
+                            <property name="visible">True</property>
+                            <property name="halign">end</property>
+                            <property name="valign">baseline</property>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                          </packing>
+                        </child>
+                      </object>
+                    </child>
                   </object>
-                  <packing>
-                    <property name="expand">True</property>
-                  </packing>
-                </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="orientation">horizontal</property>
-                <property name="margin">10</property>
-                <property name="spacing">40</property>
-                <child>
-                  <object class="GtkLabel" id="pixelcache_label">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">Show Pixel Cache</property>
-                    <property name="halign">start</property>
-                    <property name="valign">baseline</property>
-                    <property name="xalign">0.0</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkSwitch" id="pixelcache_switch">
-                    <property name="visible">True</property>
-                    <property name="halign">end</property>
-                    <property name="valign">baseline</property>
-                    <signal name="notify::active" handler="pixelcache_activate"/>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                  </packing>
-                </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="orientation">horizontal</property>
-                <property name="margin">10</property>
-                <property name="spacing">40</property>
-                <child>
-                  <object class="GtkLabel" id="touchscreen_label">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">Simulate touchscreen</property>
-                    <property name="halign">start</property>
-                    <property name="valign">baseline</property>
-                    <property name="xalign">0.0</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkSwitch" id="touchscreen_switch">
-                    <property name="visible">True</property>
-                    <property name="halign">end</property>
-                    <property name="valign">baseline</property>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                  </packing>
                 </child>
               </object>
             </child>
@@ -297,8 +353,6 @@
         </child>
       </object>
     </child>
-      </object>
-    </child>
   </template>
   <object class="GtkSizeGroup">
     <property name="mode">horizontal</property>
@@ -321,5 +375,4 @@
       <widget name="debug_frame"/>
     </widgets>
   </object>
--->
 </interface>